Merge.
authoremellor@ewan <emellor@ewan>
Wed, 21 Sep 2005 14:25:58 +0000 (15:25 +0100)
committeremellor@ewan <emellor@ewan>
Wed, 21 Sep 2005 14:25:58 +0000 (15:25 +0100)
commit1bb7afe54452ce44af23ba3fdd1d1e8f37f9446c
tree0b6476e109e107dca88de646b7c56f2201c6d43e
parentf28ff9d5c08745c9618e241d62179a11c1acb4d6
parentdd0403c3f25728c61c0c3bc2b6fcaab56a89b9f4
Merge.
tools/python/xen/util/process.py
tools/python/xen/xend/image.py